From 747d94052edb1f72eff978de44c9ffc663625c00 Mon Sep 17 00:00:00 2001
From: Romain Francoise <romain@orebokech.com>
Date: Sun, 13 Jan 2013 22:26:10 +0100
Subject: [PATCH] Delete merge marker.

---
 lisp/gnus/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b2c6ac79c1c..52dc539df7b 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -43,7 +43,6 @@
 	(mml-smime-epg-find-usable-secret-key): New helper function copied from
 	mml2015.el.
 
->>>>>>> MERGE-SOURCE
 2012-12-31  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-msg.el (gnus-inews-insert-gcc): Don't insert Gcc headers if Gnus
-- 
2.30.2